Delete link-file builtin - it's kind of pointless

diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index a0a97f582275ae32210e2de107fce63ad5dd2e2d..4a3733cf5b92346f1ba7793e71d79183c288249c 100644 (file)
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -27,7 +27,6 @@ ostree_SOURCES = ostree/main.c \
        ostree/ot-builtin-compose.c \
        ostree/ot-builtin-fsck.c \
        ostree/ot-builtin-init.c \
-       ostree/ot-builtin-link-file.c \
        ostree/ot-builtin-log.c \
        ostree/ot-builtin-pull.c \
        ostree/ot-builtin-run-triggers.c \

diff --git a/ostree/main.c b/ostree/main.c
index e3a205feff44f37777e7dda2e88a72d9e232afb1..574f9b7aa846a9a916fc75de03ef695b3e3cbd0c 100644 (file)
--- a/ostree/main.c
+++ b/ostree/main.c
@@ -32,7 +32,6 @@ static OstreeBuiltin builtins[] = {
   { "init", ostree_builtin_init, 0 },
   { "commit", ostree_builtin_commit, 0 },
   { "compose", ostree_builtin_compose, 0 },
-  { "link-file", ostree_builtin_link_file, 0 },
   { "log", ostree_builtin_log, 0 },
   { "pull", ostree_builtin_pull, 0 },
   { "fsck", ostree_builtin_fsck, 0 },

diff --git a/ostree/ot-builtin-link-file.c b/ostree/ot-builtin-link-file.c
deleted file mode 100644 (file)
index 27edcf5..0000000
--- a/ostree/ot-builtin-link-file.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2011 Colin Walters <walters@verbum.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Author: Colin Walters <walters@verbum.org>
- */
-
-#include "config.h"
-
-#include "ot-builtins.h"
-#include "ostree.h"
-
-#include <glib/gi18n.h>
-
-static gboolean ignore_exists;
-static gboolean force;
-
-static GOptionEntry options[] = {
-  { "ignore-exists", 'n', 0, G_OPTION_ARG_NONE, &ignore_exists, "Don't error if file exists", NULL },
-  { "force", 'f', 0, G_OPTION_ARG_NONE, &force, "If object exists, relink file", NULL },
-  { NULL }
-};
-
-gboolean
-ostree_builtin_link_file (int argc, char **argv, const char *repo_path, GError **error)
-{
-  GOptionContext *context;
-  gboolean ret = FALSE;
-  OstreeRepo *repo = NULL;
-  int i;
-
-  context = g_option_context_new ("- Create a new hard link in the repository");
-  g_option_context_add_main_entries (context, options, NULL);
-
-  if (!g_option_context_parse (context, &argc, &argv, error))
-    goto out;
-
-  repo = ostree_repo_new (repo_path);
-  if (!ostree_repo_check (repo, error))
-    goto out;
-
-  for (i = 0; i < argc-1; i++)
-    {
-      if (!ostree_repo_link_file (repo, argv[i+1], ignore_exists, force, error))
-        goto out;
-    }
- 
-  ret = TRUE;
- out:
-  if (context)
-    g_option_context_free (context);
-  g_clear_object (&repo);
-  return ret;
-}

diff --git a/ostree/ot-builtins.h b/ostree/ot-builtins.h
index 232d3413464d171e7f3ad55b16aa9a7a178bb2f7..5682b2b277a725e4d97054c9caded01b33846b9c 100644 (file)
--- a/ostree/ot-builtins.h
+++ b/ostree/ot-builtins.h
@@ -41,7 +41,6 @@ gboolean ostree_builtin_commit (int argc, char **argv, const char *repo, GError
 gboolean ostree_builtin_compose (int argc, char **argv, const char *repo, GError **error);
 gboolean ostree_builtin_init (int argc, char **argv, const char *repo, GError **error);
 gboolean ostree_builtin_log (int argc, char **argv, const char *repo, GError **error);
-gboolean ostree_builtin_link_file (int argc, char **argv, const char *repo, GError **error);
 gboolean ostree_builtin_pull (int argc, char **argv, const char *repo, GError **error);
 gboolean ostree_builtin_run_triggers (int argc, char **argv, const char *repo, GError **error);
 gboolean ostree_builtin_fsck (int argc, char **argv, const char *repo, GError **error);